Skip to content

LLVM: Always pass host/target info to compiler-rt/libstdcxxClang#84531

Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom
TravisWhitaker:cross-clang
Apr 14, 2020
Merged

LLVM: Always pass host/target info to compiler-rt/libstdcxxClang#84531
Ericson2314 merged 1 commit intoNixOS:masterfrom
TravisWhitaker:cross-clang

Conversation

@TravisWhitaker
Copy link
Contributor

@TravisWhitaker TravisWhitaker commented Apr 7, 2020

Here, for LLVM 5-10, information about the host platform is always passed to compiler-rt's build system (even if stdenv.hostPlatform.useLLVM isn't set) and to clang as -target and compiler-rt flags in libstdcxxClang's CC wrapper. These fixes allow llvmPackages_*.stdenv to be used for cross builds and fixes #40934

I'd appreciate review from @LnL7 and @ElvishJerricco, who I know have poked at this stuff before, as well as anyone else familiar with the cross build machinery.

I wasn't able to figure out how the clang-wrapper gets crtbegin.o, etc. in the non cross case, so there's a good chance these flags should be added somewhere else.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 7, 2020
@TravisWhitaker TravisWhitaker force-pushed the cross-clang branch 2 times, most recently from 3a1d157 to c9aa1da Compare April 7, 2020 04:47
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 7, 2020
@Ericson2314
Copy link
Member

Oh this reminds me, there are some things I synced up to version 9 on master and 20.03, but not 10. Let me do that first.

@Ericson2314
Copy link
Member

Did that in #85167. I suppose I can rebase this later today.

@Ericson2314
Copy link
Member

I guess this is just barely in-bounds for master rather than staging.

@Ericson2314 Ericson2314 merged commit 40000eb into NixOS:master Apr 14, 2020
@TravisWhitaker
Copy link
Contributor Author

@Ericson2314 Thanks!

@matthewbauer
Copy link
Member

I think this causes the regression in #85622

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Clang can't be used to cross-build packages.

4 participants